Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sources: update deny.toml to version 2 #3885

Merged
merged 1 commit into from
Apr 11, 2024
Merged

sources: update deny.toml to version 2 #3885

merged 1 commit into from
Apr 11, 2024

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented Apr 10, 2024

Description of changes:

Several keys have been deprecated in favor of the same default values we were specifying before. By removing them and adding version = 2 under licenses we will maintain the same behavior, but without the deprecation notices.

Testing done:

BEFORE

[cargo-make][1] INFO - Running Task: check-licenses
warning[deprecated]: this key will be removed in a future update, see https://github.com/EmbarkStudios/cargo-deny/pull/611 for details
  ┌─ /tmp/sources/deny.toml:2:1
  │
2 │ unlicensed = "deny"
  │ ^^^^^^^^^^

warning[deprecated]: this key will be removed in a future update, see https://github.com/EmbarkStudios/cargo-deny/pull/611 for details
  ┌─ /tmp/sources/deny.toml:6:1
  │
6 │ allow-osi-fsf-free = "neither"
  │ ^^^^^^^^^^^^^^^^^^

warning[deprecated]: this key will be removed in a future update, see https://github.com/EmbarkStudios/cargo-deny/pull/611 for details
  ┌─ /tmp/sources/deny.toml:5:1
  │
5 │ copyleft = "deny"
  │ ^^^^^^^^

warning[deprecated]: this key will be removed in a future update, see https://github.com/EmbarkStudios/cargo-deny/pull/611 for details
  ┌─ /tmp/sources/deny.toml:7:1
  │
7 │ default = "deny"
  │ ^^^^^^^

bans ok, licenses ok, sources ok

AFTER

[cargo-make][1] INFO - Running Task: check-licenses
bans ok, licenses ok, sources ok

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@jpculp
sources: update deny.toml to version 2
39e9e65 
Several keys have been deprecated in favor of the same default values we
were specifying before. By removing them and adding `version = 2` under
licenses we will maintain the same behavior, but without the deprecation
notices.
@jpculp jpculp requested review from bcressey and webern April 10, 2024 17:57
@larvacea
Copy link
Member

As the "before" paragraph says, the changes to the tool's behavior are fully described in EmbarkStudios/cargo-deny#611.

@jpculp jpculp merged commit 7258b2c into bottlerocket-os:develop Apr 11, 2024
35 checks passed
@jpculp jpculp deleted the deny-v2 branch April 11, 2024 20:42
@bcressey bcressey mentioned this pull request Jun 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sam-berning sam-berning sam-berning approved these changes

@sumukhballal sumukhballal sumukhballal approved these changes

@bcressey bcressey bcressey approved these changes

@webern webern Awaiting requested review from webern

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jpculp @larvacea @bcressey @sumukhballal @sam-berning